Massive search-and-replace to eliminate non-unneeded args being passed

to the read and write inits.
gpx.c had non-mechanical changes for logpoint and urlbase options.

diff --git a/gpsbabel/cetus.c b/gpsbabel/cetus.c
index bc6c2ecc3481ca4a64ff4e2af8d342addfbdab35..ac48612bad77da3976cf878c9e908ea6f00a24ee 100644 (file)
--- a/gpsbabel/cetus.c
+++ b/gpsbabel/cetus.c
@@ -87,7 +87,7 @@ arglist_t cetus_args[] = {
 };
 
 static void
-rd_init(const char *fname, const char *args)
+rd_init(const char *fname)
 {
        file_in = fopen(fname, "rb");
        if (file_in == NULL) {
@@ -106,7 +106,7 @@ rd_deinit(void)
 }
 
 static void
-wr_init(const char *fname, const char *args)
+wr_init(const char *fname)
 {
        file_out = fopen(fname, "wb");
        out_fname = fname;

diff --git a/gpsbabel/copilot.c b/gpsbabel/copilot.c
index 1147b4aac17e769eb674bc02bbf0345c39ba2f03..7a15bdb0e398f91d52cb94b99c66959a8981fbb2 100644 (file)
--- a/gpsbabel/copilot.c
+++ b/gpsbabel/copilot.c
@@ -49,7 +49,7 @@ struct pdb *opdb;
 struct pdb_record *opdb_rec;
 
 static void
-rd_init(const char *fname, const char *args)
+rd_init(const char *fname)
 {
        file_in = fopen(fname, "rb");
        if (file_in == NULL) {
@@ -64,7 +64,7 @@ rd_deinit(void)
 }
 
 static void
-wr_init(const char *fname, const char *args)
+wr_init(const char *fname)
 {
        file_out = fopen(fname, "wb");
        out_fname = fname;

diff --git a/gpsbabel/defs.h b/gpsbabel/defs.h
index 9684c947f4b7f08924e5ff2f7d5b970cb0b82d8e..fea48868d1807107616445be8c503d74627775ce 100644 (file)
--- a/gpsbabel/defs.h
+++ b/gpsbabel/defs.h
@@ -173,7 +173,7 @@ typedef struct {
        int rte_waypt_ct;               /* # waypoints in waypoint list */
 } route_head;
 
-typedef void (*ff_init) (char const *, char const *);
+typedef void (*ff_init) (char const *);
 typedef void (*ff_deinit) (void);
 typedef void (*ff_read) (void);
 typedef void (*ff_write) (void);

diff --git a/gpsbabel/easygps.c b/gpsbabel/easygps.c
index 533fc384c072f4cf65999918e10ec0c5d1c5f49a..d7952e40da14b86ea45fdc4c248d52970f86fd54 100644 (file)
--- a/gpsbabel/easygps.c
+++ b/gpsbabel/easygps.c
@@ -36,7 +36,7 @@ arglist_t easygps_args[] = {
 };
 
 static void
-rd_init(const char *fname, const char *args)
+rd_init(const char *fname)
 {
        char ibuf[100] = {'0'} ;
        const char *ezsig = "TerraByte Location File";
@@ -61,7 +61,7 @@ rd_deinit(void)
 }
 
 static void
-wr_init(const char *fname, const char *args)
+wr_init(const char *fname)
 {
        file_out = fopen(fname, "wb");
        mkshort_handle = mkshort_new_handle();

diff --git a/gpsbabel/garmin.c b/gpsbabel/garmin.c
index c1202fda2ef31be59a82775c3bb1f58a9b72d9b4..0e4d215963f08e20c35a5b940b09d17267e3e3dd 100644 (file)
--- a/gpsbabel/garmin.c
+++ b/gpsbabel/garmin.c
@@ -30,7 +30,7 @@ static const char *portname;
 static void *mkshort_handle;
 
 static void
-rw_init(const char *fname, const char *opts)
+rw_init(const char *fname)
 {
        if (!mkshort_handle)
                mkshort_handle = mkshort_new_handle();

diff --git a/gpsbabel/gcdb.c b/gpsbabel/gcdb.c
index 9a9c7b36494437eab36005a6c71a3bafb0daca94..39d44b0e985f95c3756320d904ccf70c5a84e4dc 100644 (file)
--- a/gpsbabel/gcdb.c
+++ b/gpsbabel/gcdb.c
@@ -57,7 +57,7 @@ static char *tbuf = NULL;
 static char *tbufp = NULL;
 
 static void
-rd_init(const char *fname, const char *args)
+rd_init(const char *fname)
 {
        file_in = fopen(fname, "rb");
        if (file_in == NULL) {
@@ -72,7 +72,7 @@ rd_deinit(void)
 }
 
 static void
-wr_init(const char *fname, const char *args)
+wr_init(const char *fname)
 {
        file_out = fopen(fname, "wb");
        out_fname = fname;

diff --git a/gpsbabel/geo.c b/gpsbabel/geo.c
index 0957387a658a48a9ee2c32388913f9c17e208b99..f5d6da5375c783a5447eda01b77fe803a46f1c55 100644 (file)
--- a/gpsbabel/geo.c
+++ b/gpsbabel/geo.c
@@ -40,7 +40,7 @@ FILE *ofd;
 
 #if NO_EXPAT
 void
-geo_rd_init(const char *fname, const char *args)
+geo_rd_init(const char *fname)
 {
        fatal(MYNAME ": This build excluded GPX support becuase expat was not installed.\n");
 }
@@ -185,7 +185,7 @@ geo_cdata(void *dta, const XML_Char *s, int len)
 }
 
 void
-geo_rd_init(const char *fname, const char *args)
+geo_rd_init(const char *fname)
 {
        fd = fopen(fname, "r");
        if (fd == NULL) {
@@ -235,7 +235,7 @@ geo_rd_deinit(void)
 }
 
 void
-geo_wr_init(const char *fname, const char *args)
+geo_wr_init(const char *fname)
 {
        ofd = fopen(fname, "w");
        if (ofd == NULL) {

diff --git a/gpsbabel/gpilots.c b/gpsbabel/gpilots.c
index e9dce03cdb522ae3b624b4280b8719bc4af6939a..92f437df31eb46741e8cebb29435102522e8a600 100644 (file)
--- a/gpsbabel/gpilots.c
+++ b/gpsbabel/gpilots.c
@@ -122,7 +122,7 @@ arglist_t my_args[] = {
 };
 
 static void
-rd_init(const char *fname, const char *args)
+rd_init(const char *fname)
 {
        file_in = fopen(fname, "rb");
        if (file_in == NULL) {
@@ -141,7 +141,7 @@ rd_deinit(void)
 }
 
 static void
-wr_init(const char *fname, const char *args)
+wr_init(const char *fname)
 {
        file_out = fopen(fname, "wb");
        out_fname = fname;

diff --git a/gpsbabel/gpsdrive.c b/gpsbabel/gpsdrive.c
index 2db56a99b0901a4aa554a45578167a175f6737bc..1fb701ab1ee872c875ef9e43f451148866ed6831 100644 (file)
--- a/gpsbabel/gpsdrive.c
+++ b/gpsbabel/gpsdrive.c
@@ -39,7 +39,7 @@ static void *mkshort_rd_handle;
 #define MYNAME "GPSDRIVE"
 
 static void
-rd_init(const char *fname, const char *args)
+rd_init(const char *fname)
 {
        file_in = fopen(fname, "r");
        if (file_in == NULL) {
@@ -54,7 +54,7 @@ rd_deinit(void)
 }
 
 static void
-wr_init(const char *fname, const char *args)
+wr_init(const char *fname)
 {
        file_out = fopen(fname, "w");
        if (file_out == NULL) {

diff --git a/gpsbabel/gpspilot.c b/gpsbabel/gpspilot.c
index f494b3b3e335e9323ef41aebe24df07b076dcd12..36805443d54f6b0c2a551914ebada19264f4351b 100644 (file)
--- a/gpsbabel/gpspilot.c
+++ b/gpsbabel/gpspilot.c
@@ -59,7 +59,7 @@ arglist_t gpspilot_args[] = {
 };
 
 static void
-rd_init(const char *fname, const char *args)
+rd_init(const char *fname)
 {
        file_in = fopen(fname, "rb");
        if (file_in == NULL) {
@@ -78,7 +78,7 @@ rd_deinit(void)
 }
 
 static void
-wr_init(const char *fname, const char *args)
+wr_init(const char *fname)
 {
        file_out = fopen(fname, "wb");
        out_fname = fname;

diff --git a/gpsbabel/gpsutil.c b/gpsbabel/gpsutil.c
index 72508b3868acd633a47fba03571074f6c2e468f1..a0410ba66963691123b72c14d939e68da00a1c8a 100644 (file)
--- a/gpsbabel/gpsutil.c
+++ b/gpsbabel/gpsutil.c
@@ -12,7 +12,7 @@ static void *mkshort_handle;
 #define MYNAME "GPSUTIL"
 
 static void
-rd_init(const char *fname, const char *args)
+rd_init(const char *fname)
 {
        file_in = fopen(fname, "r");
        if (file_in == NULL) {
@@ -27,7 +27,7 @@ rd_deinit(void)
 }
 
 static void
-wr_init(const char *fname, const char *args)
+wr_init(const char *fname)
 {
        file_out = fopen(fname, "w");
        if (file_out == NULL) {

diff --git a/gpsbabel/gpx.c b/gpsbabel/gpx.c
index 62c67b2fdb4384295d694efc1808a27ee9089776..01c021587635b3e2dd2ac4d363a63c6b047c5440 100644 (file)
--- a/gpsbabel/gpx.c
+++ b/gpsbabel/gpx.c
@@ -53,7 +53,7 @@ static int in_number;
 
 static xml_tag *cur_tag;
 static char *cdatastr;
-static int opt_logpoint = 0;
+static char *opt_logpoint = NULL;
 static int logpoint_ct = 0;
 
 static const char *gpx_version;
@@ -674,7 +674,7 @@ gpx_end(void *data, const char *el)
 
 #if NO_EXPAT
 void
-gpx_rd_init(const char *fname, const char *args)
+gpx_rd_init(const char *fname)
 {
        fatal(MYNAME ": This build excluded GPX support becuase expat was not installed.\n");
 }
@@ -744,7 +744,7 @@ gpx_cdata(void *dta, const XML_Char *s, int len)
 }
 
 void
-gpx_rd_init(const char *fname, const char *args)
+gpx_rd_init(const char *fname)
 {
        if ( fname[0] ) {
                fd = fopen(fname, "r");
@@ -758,8 +758,6 @@ gpx_rd_init(const char *fname, const char *args)
                input_string_len = strlen(input_string);
        }
 
-        if (get_option(args, "logpoint") != NULL)
-            opt_logpoint = 1;
 
        file_time = 0;
        
@@ -785,10 +783,9 @@ gpx_rd_deinit(void)
 }
 
 void
-gpx_wr_init(const char *fname, const char *args)
+gpx_wr_init(const char *fname)
 {
        mkshort_handle = mkshort_new_handle();
-       urlbase = get_option(args, "urlbase");
 
        ofd = fopen(fname, "w");
        if (ofd == NULL) {
@@ -1198,6 +1195,8 @@ arglist_t gpx_args[] = {
        { "snlen", &snlen, "Length of generated shortnames", ARGTYPE_INT },
        { "suppresswhite", &suppresswhite, 
                "Suppress whitespace in generated shortnames", ARGTYPE_BOOL },
+       { "logpoint", &opt_logpoint, "Create waypoints from geocache log entries", ARGTYPE_BOOL },
+       { "urlbase", &urlbase, "Base URL for link tag in output", ARGTYPE_STRING},
        { 0, 0, 0, 0 }
 };
 

diff --git a/gpsbabel/holux.c b/gpsbabel/holux.c
index 3a1e8091d9bdeff40e488009a8d1502543b7d0f5..14e1a93730cc1d805b3840a6f83e9fa2ce68d9ac 100644 (file)
--- a/gpsbabel/holux.c
+++ b/gpsbabel/holux.c
@@ -38,7 +38,7 @@ static  void *mkshort_handle;
 static  char fOutname[256];
 
 
-static void rd_init(const char *fname, const char *args)
+static void rd_init(const char *fname)
 {
        file_in = fopen(fname, "rb");
        if (file_in == NULL) {
@@ -57,7 +57,7 @@ static void rd_deinit(void)
 
 
 static void
-wr_init(const char *fname, const char *args)
+wr_init(const char *fname)
 {
        mkshort_handle = mkshort_new_handle();
 

diff --git a/gpsbabel/magnav.c b/gpsbabel/magnav.c
index 8d61b26008013ac4da0f4f45a0380e9cae7cc062..269c1313d5cd43e6fdff3d527ba453cf7f0deef7 100644 (file)
--- a/gpsbabel/magnav.c
+++ b/gpsbabel/magnav.c
@@ -58,7 +58,7 @@ struct pdb *opdb;
 struct pdb_record *opdb_rec;
 
 static void
-rd_init(const char *fname, const char *args)
+rd_init(const char *fname)
 {
        file_in = fopen(fname, "rb");
        if (file_in == NULL) {
@@ -73,7 +73,7 @@ rd_deinit(void)
 }
 
 static void
-wr_init(const char *fname, const char *args)
+wr_init(const char *fname)
 {
        file_out = fopen(fname, "wb");
        out_fname = fname;

diff --git a/gpsbabel/magproto.c b/gpsbabel/magproto.c
index 9792aa8f1b7b990465bb571219c7c3590b05e1e6..4f19669e9a8b8f61f56217606d34011de80b7d22 100644 (file)
--- a/gpsbabel/magproto.c
+++ b/gpsbabel/magproto.c
@@ -697,7 +697,7 @@ arglist_t mag_args[] = {
 };
 
 static void
-mag_rd_init(const char *portname, const char *args)
+mag_rd_init(const char *portname)
 {
        time_t now, later;
 
@@ -748,7 +748,7 @@ mag_rd_init(const char *portname, const char *args)
 }
 
 static void
-mag_wr_init(const char *portname, const char *args)
+mag_wr_init(const char *portname)
 {
 #if __WIN32__
        if (!terminit(portname)) {
@@ -788,7 +788,7 @@ mag_wr_init(const char *portname, const char *args)
                        xCloseHandle(comport);
                }
 #endif
-               mag_rd_init(portname, args);
+               mag_rd_init(portname);
        }
        QUEUE_INIT(&rte_wpt_tmp);
 }

diff --git a/gpsbabel/main.c b/gpsbabel/main.c
index e005f7eea97a2b5c30477c392b565188a4c8f16e..27a6ef470f65df5c8ee113b0d8a37723b29a97c3 100644 (file)
--- a/gpsbabel/main.c
+++ b/gpsbabel/main.c
@@ -133,7 +133,7 @@ main(int argc, char *argv[])
                                if (ivecs == NULL) {
                                        fatal ("No valid input type specified\n");
                                }
-                               ivecs->rd_init(fname, ivec_opts);
+                               ivecs->rd_init(fname);
                                ivecs->read();
                                ivecs->rd_deinit();
                                break;
@@ -142,7 +142,7 @@ main(int argc, char *argv[])
                                        ? argv[argn]+2 : argv[++argn];
                                ofname = optarg;
                                if (ovecs) {
-                                       ovecs->wr_init(ofname, ovec_opts);
+                                       ovecs->wr_init(ofname);
                                        ovecs->write();
                                        ovecs->wr_deinit();
                                }
@@ -205,11 +205,11 @@ main(int argc, char *argv[])
                fatal ("Extra arguments on command line\n");
        }
        else if (argc && ivecs) {
-               ivecs->rd_init(argv[0], ivec_opts);
+               ivecs->rd_init(argv[0]);
                ivecs->read();
                ivecs->rd_deinit();
                if (argc == 2 && ovecs) {
-                       ovecs->wr_init(argv[1], ovec_opts);
+                       ovecs->wr_init(argv[1]);
                        ovecs->write();
                        ovecs->wr_deinit();
                }

diff --git a/gpsbabel/mapopolis.c b/gpsbabel/mapopolis.c
index f7d7540ff9a95d68d5e59f0e435b8cf45143fe7b..a6bf20e0f8bbb7b9e8f7daf77851cec50afd4fe3 100644 (file)
--- a/gpsbabel/mapopolis.c
+++ b/gpsbabel/mapopolis.c
@@ -73,7 +73,7 @@ struct pdb *opdb;
 struct pdb_record *opdb_rec;
 
 static void
-rd_init(const char *fname, const char *args)
+rd_init(const char *fname)
 {
        file_in = fopen(fname, "rb");
        if (file_in == NULL) {
@@ -88,7 +88,7 @@ rd_deinit(void)
 }
 
 static void
-wr_init(const char *fname, const char *args)
+wr_init(const char *fname)
 {
        file_out = fopen(fname, "wb");
        out_fname = fname;

diff --git a/gpsbabel/mapsend.c b/gpsbabel/mapsend.c
index d1aafdc7dfde7b347d48e544ba703bcfbe3e68e9..43da0edca8d783910011e40a5447f311a7b89611 100644 (file)
--- a/gpsbabel/mapsend.c
+++ b/gpsbabel/mapsend.c
@@ -54,7 +54,7 @@ test_endianness(void)
 }
 
 static void
-mapsend_rd_init(const char *fname, const char *args)
+mapsend_rd_init(const char *fname)
 {
        mapsend_file_in = fopen(fname, "rb");
        if (mapsend_file_in == NULL) {
@@ -169,7 +169,7 @@ my_fwrite4(int *ptr, FILE *stream)
 }
 
 static void
-mapsend_wr_init(const char *fname, const char *args)
+mapsend_wr_init(const char *fname)
 {
        mapsend_file_out = fopen(fname, "wb");
        if (mapsend_file_out == NULL) {

diff --git a/gpsbabel/mapsource.c b/gpsbabel/mapsource.c
index 5ebc91894ca749a939a9065fda0a364c213691b7..23ca79d69bb3144c53d58262ec0bc3543822a6c0 100644 (file)
--- a/gpsbabel/mapsource.c
+++ b/gpsbabel/mapsource.c
@@ -105,7 +105,7 @@ mps_find_icon_number_from_desc(const char *desc, garmin_formats_e garmin_format)
 }
 
 static void
-mps_rd_init(const char *fname, const char *args)
+mps_rd_init(const char *fname)
 {
        mps_file_in = fopen(fname, "rb");
        if (mps_file_in == NULL) {
@@ -120,7 +120,7 @@ mps_rd_deinit(void)
 }
 
 static void
-mps_wr_init(const char *fname, const char *args)
+mps_wr_init(const char *fname)
 {
        mps_file_out = fopen(fname, "wb");
        if (mps_file_out == NULL) {

diff --git a/gpsbabel/navicache.c b/gpsbabel/navicache.c
index fc5eb9950658018be644dd4285decc75ad0bb521..929073730f7f710020ccb24a16ab2cd6ca6cd474 100644 (file)
--- a/gpsbabel/navicache.c
+++ b/gpsbabel/navicache.c
@@ -32,7 +32,7 @@ FILE *ofd;
 
 #if NO_EXPAT
 void
-nav_rd_init(const char *fname, const char *args)
+nav_rd_init(const char *fname)
 {
        fatal(MYNAME ": This build excluded GPX support becuase expat was not installed.\n");
 }
@@ -149,7 +149,7 @@ nav_end(void *data, const char *el)
 }
 
 void
-nav_rd_init(const char *fname, const char *args)
+nav_rd_init(const char *fname)
 {
        fd = fopen(fname, "r");
        if (fd == NULL) {
@@ -190,7 +190,7 @@ nav_rd_deinit(void)
 }
 
 void
-nav_wr_init(const char *fname, const char *args)
+nav_wr_init(const char *fname)
 {
        fatal(MYNAME ": Does not support writing Navicache files.\n");
        ofd = fopen(fname, "w");

diff --git a/gpsbabel/pcx.c b/gpsbabel/pcx.c
index 6f8c96001d2660b752b80f1b9d6389d0595e3639..e1a98948449abdfa05c9134b18c9bbf0fd4f91bc 100644 (file)
--- a/gpsbabel/pcx.c
+++ b/gpsbabel/pcx.c
@@ -37,7 +37,7 @@ arglist_t pcx_args[] = {
 };
 
 static void
-rd_init(const char *fname, const char *args)
+rd_init(const char *fname)
 {
        file_in = fopen(fname, "r");
        if (file_in == NULL) {
@@ -52,7 +52,7 @@ rd_deinit(void)
 }
 
 static void
-wr_init(const char *fname, const char *args)
+wr_init(const char *fname)
 {
        file_out = fopen(fname, "w");
        mkshort_handle = mkshort_new_handle();

diff --git a/gpsbabel/psp.c b/gpsbabel/psp.c
index 2451f57d1e1c1ea10abe51df8993295120d8c3d3..b07657498983667de6de1c186b3b9a742a688d8e 100644 (file)
--- a/gpsbabel/psp.c
+++ b/gpsbabel/psp.c
@@ -242,7 +242,7 @@ buffer_washer(char * buff, int buffer_len)
 }
 
 static void
-psp_rd_init(const char *fname, const char *args)
+psp_rd_init(const char *fname)
 {
        psp_file_in = fopen(fname, "rb");
        if (psp_file_in == NULL) {
@@ -257,7 +257,7 @@ psp_rd_deinit(void)
 }
 
 static void
-psp_wr_init(const char *fname, const char *args)
+psp_wr_init(const char *fname)
 {
        psp_file_out = fopen(fname, "wb");
        mkshort_handle = mkshort_new_handle();

diff --git a/gpsbabel/quovadis.c b/gpsbabel/quovadis.c
index 4d0b9ad670998950b81dcafdb8f095815e82c51e..3cc67243ffd102c71a76bad594bcc8e4ea049c68 100644 (file)
--- a/gpsbabel/quovadis.c
+++ b/gpsbabel/quovadis.c
@@ -74,7 +74,7 @@ static int wpt_to_icon(geocache_type  type) {
 }
 
 static void
-rd_init(const char *fname, const char *args)
+rd_init(const char *fname)
 {
        file_in = fopen(fname, "rb");
        if (file_in == NULL) {
@@ -93,7 +93,7 @@ rd_deinit(void)
 }
 
 static void
-wr_init(const char *fname, const char *args)
+wr_init(const char *fname)
 {
        file_out = fopen(fname, "wb");
        out_fname = fname;

diff --git a/gpsbabel/saroute.c b/gpsbabel/saroute.c
index 14923e86b89ac50e1232174094b8194e5559e70a..40110825e03b355bfbd04e0cd178c65ac3310e23 100644 (file)
--- a/gpsbabel/saroute.c
+++ b/gpsbabel/saroute.c
@@ -64,8 +64,7 @@ Skip(FILE * f,
 }
 
 static void
-rd_init(const char *fname,
-       const char *args)
+rd_init(const char *fname)
 {
        infile = fopen(fname, "rb");
        if (infile == NULL) {
@@ -225,8 +224,7 @@ my_read(void)
 }
 
 static void
-wr_init(const char *fname,
-       const char *args)
+wr_init(const char *fname)
 {
        fatal(MYNAME ":Not enough information is known about this format to write it.\n");
 }

diff --git a/gpsbabel/tiger.c b/gpsbabel/tiger.c
index 0a95a1ecfdb20e7176d3283b5fd5bcb28e1a1430..1f527361bf081b8f91818933cc7d42d0427e9e2c 100644 (file)
--- a/gpsbabel/tiger.c
+++ b/gpsbabel/tiger.c
@@ -92,7 +92,7 @@ arglist_t tiger_args[] = {
 
 
 static void
-rd_init(const char *fname, const char *args)
+rd_init(const char *fname)
 {
        file_in = fopen(fname, "r");
        mkshort_handle = mkshort_new_handle();
@@ -110,7 +110,7 @@ rd_deinit(void)
 }
 
 static void
-wr_init(const char *fname, const char *args)
+wr_init(const char *fname)
 {
        file_out = fopen(fname, "w");
        thresh_days = strtod(oldthresh, NULL);

diff --git a/gpsbabel/tmpro.c b/gpsbabel/tmpro.c
index 8bc695659bc23d404743b88e4acff4d72bb330b9..1343a72d71eee64bd56f7bfcee7ce5d6410183f2 100644 (file)
--- a/gpsbabel/tmpro.c
+++ b/gpsbabel/tmpro.c
@@ -43,7 +43,7 @@ static FILE *file_out;
 static void *mkshort_handle;
 
 static void 
-rd_init(const char *fname, const char *args)
+rd_init(const char *fname)
 {
     file_in = fopen(fname, "r");
     if (file_in == NULL) {
@@ -58,7 +58,7 @@ rd_deinit(void)
 }
 
 static void 
-wr_init(const char *fname, const char *args)
+wr_init(const char *fname)
 {
     file_out = fopen(fname, "w");
     if (file_out == NULL) {

diff --git a/gpsbabel/tpg.c b/gpsbabel/tpg.c
index 0775cf9366a8178396126364405b4b57d267c5f0..44bd48ea95e4026df8dd24da78326434ee3765f6 100644 (file)
--- a/gpsbabel/tpg.c
+++ b/gpsbabel/tpg.c
@@ -130,7 +130,7 @@ valid_tpg_header(char * header, int len)
 }
 
 static void
-tpg_rd_init(const char *fname, const char *args)
+tpg_rd_init(const char *fname)
 {
        tpg_file_in = fopen(fname, "rb");
        if (tpg_file_in == NULL) {
@@ -145,7 +145,7 @@ tpg_rd_deinit(void)
 }
 
 static void
-tpg_wr_init(const char *fname, const char *args)
+tpg_wr_init(const char *fname)
 {
        tpg_file_out = fopen(fname, "wb");
        mkshort_handle = mkshort_new_handle();

diff --git a/gpsbabel/xcsv.c b/gpsbabel/xcsv.c
index b99d5af32ed08f9f088502969191637aa3375a34..b2e09cecae93d30bff20c842ef6fcbd6b343eb71 100644 (file)
--- a/gpsbabel/xcsv.c
+++ b/gpsbabel/xcsv.c
@@ -450,7 +450,7 @@ xcsv_read_internal_style(const char *style_buf)
 }
 
 static void
-xcsv_rd_init(const char *fname, const char *args)
+xcsv_rd_init(const char *fname)
 {
 
     /* 
@@ -479,7 +479,7 @@ xcsv_rd_deinit(void)
 }
 
 static void
-xcsv_wr_init(const char *fname, const char *args)
+xcsv_wr_init(const char *fname)
 {
     /* if we don't have an internal style defined, we need to
      * read it from a user-supplied style file, or die trying.